ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 17:45:10 +01:00
Code Issues Releases Wiki Activity
1,884 Commits 115 Branches 0 Tags 13 MiB
3374862edf
Commit Graph

59 Commits

Author SHA1 Message Date
Tim Daubenschütz
bccfc0906f Revert super funny-"Important minor fix" 
We better want this not to go live

This reverts commit b77fefb55c.

Conflicts:
	js/constants/application_constants.js
 2015-11-20 16:17:08 +01:00
Tim Daubenschütz
0946ddc0b3 Minor fix 2015-11-20 14:00:10 +01:00
Tim Daubenschütz
b77fefb55c Important minor fix 2015-11-20 10:21:21 +01:00
Tim Daubenschütz
339421a4b7 Merge branch 'master' into AD-56-add-social-share-functionality 
Conflicts:
	js/components/ascribe_detail/media_container.js
	js/components/ascribe_media/media_player.js
 2015-11-16 15:54:49 +01:00
Tim Daubenschütz
286dd114af Merge pull request #16 from ascribe/AD-1255-refactor-aclbuttons-form-creatio 
Ad 1255 refactor aclbuttons form creatio
 2015-11-16 13:50:13 +01:00
Brett Sun
00d93d912b Move 3rd party api urls to AppConstants 2015-11-13 13:33:27 +01:00
Brett Sun
8dc0470007 Add Twitter button 2015-11-09 19:01:27 +01:00
Brett Sun
d972da935a Add Facebook Share button 2015-11-09 17:46:49 +01:00
Tim Daubenschütz
f5a5e045a6 Finalize boilerplate for portfolioreview subdomain 2015-11-06 15:18:46 +01:00
Brett Sun
56eff0d9ed Improve DRYness of acl buttons 
The React dev tools don’t seem to be able to automatically pick up the
displayName when using createClass from within another function, so
it’s added here to give clarity when debugging.
 2015-11-06 15:10:29 +01:00
TimDaubenschuetz
9dec5eab1d Merged in AD-744-search-filter-not-working-i-type- (pull request #97) 
Ad 744 search filter not working i type
 2015-10-15 15:16:33 +02:00
Tim Daubenschütz
002bab8e79 Increase additional data file size 2015-10-13 10:13:53 +02:00
Tim Daubenschütz
6d36be5311 Add documentation for SearchBar and put threshold into AppConstants 2015-10-12 17:10:04 +02:00
Tim Daubenschütz
90d6ec20f6 Revert "Revert "acls on 3 levels"" 
This reverts commit c02d1ea3ac.
 2015-09-22 17:38:25 +02:00
Tim Daubenschütz
c02d1ea3ac Revert "acls on 3 levels" 
This reverts commit f1bc400faf.
 2015-09-22 17:29:07 +02:00
diminator
f1bc400faf acls on 3 levels 
whitelabel
user
piece

the higher on the list, the more power (whitelabel overrides user and piece)
 2015-09-22 17:23:19 +02:00
diminator
b24d4608dd Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields 2015-09-16 15:59:07 +02:00
Tim Daubenschütz
7c376b7229 PR Feedback: add getLangText and move itemLimit and sizeLimit to app constants 2015-09-16 15:14:08 +02:00
diminator
d6bd4b4ac1 bug fix acl button 
form copyright association + account settings
bug fix dispatch in form loan
ikonotv slides
 2015-09-16 14:07:13 +02:00
Tim Daubenschütz
e087e9f332 PR Feedback: Provide source for types, change function validation, fix bool statement in Property.js 2015-09-14 11:36:24 +02:00
Tim Daubenschütz
356483f9ca Fix bug for resetting non-native HTML inputs in form 2015-09-14 10:49:45 +02:00
diminator
8ae7edaa1c ikonotv initial setup 2015-08-18 12:08:01 +02:00
diminator
fc82c866fb cyland refactor 
whitelabel + cyland app
 2015-08-17 20:52:36 +02:00
Tim Daubenschütz
f086bece71 add boilerplate code for wallet application 2015-08-11 13:10:15 +02:00
Tim Daubenschütz
95e0b256b6 Merge branch 'master' into AD-613-cyland-white-label-page 
Conflicts:
	.gitignore
 2015-08-11 11:50:09 +02:00
diminator
792325f71d acl_create_editions 2015-08-05 16:02:48 +02:00
Tim Daubenschütz
277cd98549 fix cyland logo 2015-07-29 16:08:30 +02:00
Tim Daubenschütz
f0d6eaa950 update gitignore 2015-07-29 15:57:48 +02:00
vrde
4d93e076df Add third party modules to handle tracking without polluting the code 2015-07-27 18:06:02 +02:00
Tim Daubenschütz
af42bb8e67 error handling first cut 2015-07-17 15:41:09 +02:00
Tim Daubenschütz
8e38e9e8de rename csrftoken 2015-07-16 19:16:26 +02:00
Tim Daubenschütz
ee6d2789ed set csrftokens as constants 2015-07-16 18:17:45 +02:00
vrde
5ced62c496 Cleanup constants 2015-07-14 20:06:13 +02:00
Tim Daubenschütz
ff64734545 styling 2015-07-14 17:41:57 +02:00
Tim Daubenschütz
5ef63fbba3 use local whitelabel constants for route switching 2015-07-14 17:12:32 +02:00
Tim Daubenschütz
8d15238818 add subdomain settings to constants 2015-07-14 16:53:27 +02:00
Tim Daubenschütz
60600a72d4 refactor bulk acls for backend adjustment 2015-07-13 21:19:45 +02:00
vrde
3fbe60692e Working on landing 2015-07-13 14:29:20 +02:00
ddejongh
efc7f6d46b Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar 
Conflicts:
	js/routes.js
 2015-06-19 13:13:37 +02:00
vrde
a247e111c0 Merge branch 'AD-421-add-signup-functionality' 
Conflicts:
	js/constants/api_urls.js
	js/constants/application_constants.js
 2015-06-16 10:58:41 +02:00
Tim Daubenschütz
7910384d99 solve merge conflicts 2015-06-16 09:02:48 +02:00
ddejongh
aac8ae2a9e merged master 2015-06-15 11:02:49 +02:00
Tim Daubenschütz
dcd770ab5f readd sourcemaps 2015-06-12 13:36:55 +02:00
vrde
fa97470e21 Enable CORS on the frontend 2015-06-11 17:07:27 +02:00
ddejongh
5e7f7983e1 application constants 2015-06-11 15:57:19 +02:00
ddejongh
f4c6e025ae Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- 
Conflicts:
	js/constants/api_urls.js
	js/constants/application_constants.js
 2015-06-11 15:54:50 +02:00
ddejongh
bf0a2aeefb consign unconsign requests 
async emails
 2015-06-11 15:03:55 +02:00
vrde
05b9792d3f Add some new constants to the app 2015-06-10 17:28:36 +02:00
vrde
b9c8002495 Add ENV variable to handle BASE_URL 2015-06-09 17:53:44 +02:00
ddejongh
6563bf97b0 toggable textarea 2015-06-09 13:29:22 +02:00